Merged
Conversation
Changes: - docker-library/haproxy@8d69936: Update to 2.2.1 - docker-library/haproxy@4375313: Merge pull request docker-library/haproxy#128 from infosiftr/apply-canonical-backported-patch - docker-library/haproxy@461dcbf: Apply the canonical backported ebtree patch from upstream
Diff for afba775:diff --git a/_bashbrew-cat b/_bashbrew-cat
index c327387..9413f28 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -38,7 +38,7 @@ Directory: 2.0
Tags: 2.0.16-alpine, 2.0-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: c4081598aacb56651940e84a04c8e03c403aec3c
+GitCommit: 461dcbfa8538c9ab47d41b96f3c8d1835166382e
Directory: 2.0/alpine
Tags: 2.1.7, 2.1
@@ -51,14 +51,14 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
GitCommit: e538b03ce98ce2c9bb9e6e0db26d87ad45a137d0
Directory: 2.1/alpine
-Tags: 2.2.0, 2.2, latest, lts
+Tags: 2.2.1, 2.2, latest, lts
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: b9e54c2c29daa41f5045c7e95c887abe1933ea03
+GitCommit: 8d69936c2bac1e20c720738761f85987f93b9a73
Directory: 2.2
-Tags: 2.2.0-alpine, 2.2-alpine, alpine, lts-alpine
+Tags: 2.2.1-alpine, 2.2-alpine, alpine, lts-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: b9e54c2c29daa41f5045c7e95c887abe1933ea03
+GitCommit: 8d69936c2bac1e20c720738761f85987f93b9a73
Directory: 2.2/alpine
Tags: 2.3-dev1, 2.3-dev
diff --git a/_bashbrew-list b/_bashbrew-list
index 438f001..eff9edf 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -22,8 +22,8 @@ haproxy:2.1.7
haproxy:2.1.7-alpine
haproxy:2.2
haproxy:2.2-alpine
-haproxy:2.2.0
-haproxy:2.2.0-alpine
+haproxy:2.2.1
+haproxy:2.2.1-alpine
haproxy:2.3-dev
haproxy:2.3-dev1
haproxy:2.3-dev1-alpine
diff --git a/haproxy_2.0-alpine/Dockerfile b/haproxy_2.0-alpine/Dockerfile
index 78e5223..622f119 100644
--- a/haproxy_2.0-alpine/Dockerfile
+++ b/haproxy_2.0-alpine/Dockerfile
@@ -16,6 +16,7 @@ RUN set -x \
make \
openssl \
openssl-dev \
+ patch \
pcre2-dev \
readline-dev \
tar \
@@ -27,9 +28,10 @@ RUN set -x \
&& tar -xzf haproxy.tar.gz -C /usr/src/haproxy --strip-components=1 \
&& rm haproxy.tar.gz \
# https://github.com/haproxy/haproxy/issues/760 ("ebtree/ebtree.c:43:2: error: unknown type name 'ssize_t'; did you mean 'size_t'?")
- && ! grep -qF 'unistd.h' /usr/src/haproxy/ebtree/ebtree.c \
- && awk '$1 == "#include" && !inc { print "#include <unistd.h>"; inc = 1 } { print }' /usr/src/haproxy/ebtree/ebtree.c > ebtree.c \
- && mv ebtree.c /usr/src/haproxy/ebtree/ebtree.c \
+# ebtree patch/fix: https://git.haproxy.org/?p=haproxy-2.0.git;a=commit;h=5df32b51bb0c3c89b503d04cd7d31bdd77932370
+ && wget -O ebtree.patch 'https://git.haproxy.org/?p=haproxy-2.0.git;a=patch;h=5df32b51bb0c3c89b503d04cd7d31bdd77932370' \
+ && patch -p1 --input="$PWD/ebtree.patch" --directory=/usr/src/haproxy \
+ && rm ebtree.patch \
\
&& makeOpts=' \
TARGET=linux-glibc \
diff --git a/haproxy_lts-alpine/Dockerfile b/haproxy_lts-alpine/Dockerfile
index 3cb88cb..32dd10b 100644
--- a/haproxy_lts-alpine/Dockerfile
+++ b/haproxy_lts-alpine/Dockerfile
@@ -1,9 +1,9 @@
# vim:set ft=dockerfile:
FROM alpine:3.12
-ENV HAPROXY_VERSION 2.2.0
-ENV HAPROXY_URL https://www.haproxy.org/download/2.2/src/haproxy-2.2.0.tar.gz
-ENV HAPROXY_SHA256 3c1a87160eea40e067f1e2813bfe692280a10c455beb17a8ee7fae11e4223274
+ENV HAPROXY_VERSION 2.2.1
+ENV HAPROXY_URL https://www.haproxy.org/download/2.2/src/haproxy-2.2.1.tar.gz
+ENV HAPROXY_SHA256 536552af1316807c01de727ad3dac84b3a2f5285db32e9bfdfe234e47ff9d124
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
RUN set -x \
diff --git a/haproxy_lts/Dockerfile b/haproxy_lts/Dockerfile
index e95ec77..68fa68a 100644
--- a/haproxy_lts/Dockerfile
+++ b/haproxy_lts/Dockerfile
@@ -1,9 +1,9 @@
# vim:set ft=dockerfile:
FROM debian:buster-slim
-ENV HAPROXY_VERSION 2.2.0
-ENV HAPROXY_URL https://www.haproxy.org/download/2.2/src/haproxy-2.2.0.tar.gz
-ENV HAPROXY_SHA256 3c1a87160eea40e067f1e2813bfe692280a10c455beb17a8ee7fae11e4223274
+ENV HAPROXY_VERSION 2.2.1
+ENV HAPROXY_URL https://www.haproxy.org/download/2.2/src/haproxy-2.2.1.tar.gz
+ENV HAPROXY_SHA256 536552af1316807c01de727ad3dac84b3a2f5285db32e9bfdfe234e47ff9d124
# see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
RUN set -x \ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changes: